fix(tools/loader): load and register all decorated @tool functions from file path #742
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ratish1
requested a deployment
to
manual-approval
GitHub Actions
Waiting
zastrowm
requested changes
Aug 29, 2025
src/strands/tools/loader.py
Outdated
| @@ -18,15 +18,17 @@ class ToolLoader: | |||
| """Handles loading of tools from different sources.""" | |||
|
|
|||
| @staticmethod | |||
| def load_python_tool(tool_path: str, tool_name: str) -> AgentTool: | |||
| def load_python_tool(tool_path: str, tool_name: str) -> Union[AgentTool, List[AgentTool]]: | |||
There was a problem hiding this comment.
For backwards compatibility, we need to keep this signature as-is.
Let's add a new method, load_python_tools that does what you're doing here but always turns an array. Then load_python_tool can be updated to reference the new api, returning the first element in the array. Let's then document that load_python_tool is deprecated and emit a warning if it's invoked. We can then remove the method in 2.0
Ratish1
requested a deployment
to
manual-approval
GitHub Actions
Waiting
|
Apologies, but it looks like there's some conflicts; would you be able to rebase? |
|
Yeah mb, I will do it right away. |
added 3 commits
September 3, 2025 22:48
…om file path - Collect all DecoratedFunctionTool objects when loading a .py file and return list when multiple exist - Normalize loader results and register each AgentTool separately in registry - Add normalize_loaded_tools helper and test for multiple decorated tools
Ratish1
force-pushed
the
fix/load-multiple-tools-from-file-path
branch
from
c154a32 to
1508825
Compare
Ratish1
requested a deployment
to
manual-approval
GitHub Actions
Waiting
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Previously, passing a file path that contained multiple
@tooldecorated functions resulted in only one tool being loaded/registered. This made file-based tool loading inconsistent with directory/module scanning (which returns all decorated tools). This PR fixes that: the file-path loader now collects all decorated function tools and returns them; the registry is updated to register each tool individually. Unit tests and linters were updated and run locally.Key Changes
DecoratedFunctionToolobjects when loading a.pyfile and return alistwhen multiple exist.AgentToolseparately in the registry.normalize_loaded_toolshelper tosrc/strands/tools/tools.py.test_load_python_tool_path_multiple_function_basedverifying multiple decorated tools are discovered when loading a file path.mark_dynamic()+register_tool()per tool.Related Issues
Closes #612
Documentation PR
N/A
Type of Change
Bug fix
Testing
How have you tested the change? Verify that the changes do not break functionality or introduce warnings in consuming repositories: agents-docs, agents-tools, agents-cli
hatch fmt --formatter→ 170 files left unchangedhatch fmt --linter→ All checks passedpre-commit run --all-files→ Format: Passed; Lint: Passed; Type linting: Passed; Unit Tests: Passedpytest -q tests/strands/tools/test_loader.py::test_load_python_tool_path_multiple_function_based→1 passed in 0.16shatch run test-integlocally.Checklist
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.